Revision: bazaar--devo--1.2--patch-8
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Mon Jan 31 10:08:50 GMT 2005
Standard-date: 2005-01-31 10:08:50 GMT
Modified-files: libarch/conflict-handling.c
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-12
    thelove@canonical.com/bazaar--devo--1.2--patch-8
Summary: Announce how many files conflict during a merge (fixes #4738)
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--resolve--1.2--patch-12
   Announce how many files conflict during a merge (fixes #4738)

